diff --git a/product.prop b/product.prop
index fc5a2da..29b74bb 100644
--- a/product.prop
+++ b/product.prop
@@ -1,12 +1,22 @@
 # System props to enable aac vbr feature
 persist.bluetooth.a2dp_aac.vbr_supported=true
 
+# Set the Bluetooth Class of Device
+# Service Field: 0x5A -> 90
+#    Bit 17: Networking
+#    Bit 19: Capturing
+#    Bit 20: Object Transfer
+#    Bit 22: Telephony
+# MAJOR_CLASS: 0x02 -> 2 (Phone)
+# MINOR_CLASS: 0x0C -> 12 (Smart Phone)
+bluetooth.device.class_of_device=90,2,12
+
 # Set supported Bluetooth profiles to enabled
 bluetooth.profile.asha.central.enabled=true
 bluetooth.profile.a2dp.source.enabled=true
 bluetooth.profile.avrcp.target.enabled=true
 bluetooth.profile.bap.broadcast.assist.enabled=true
-bluetooth.profile.bap.unicast.server.enabled=true
+bluetooth.profile.bap.unicast.client.enabled=true
 bluetooth.profile.bas.client.enabled=true
 bluetooth.profile.csip.set_coordinator.enabled=true
 bluetooth.profile.gatt.enabled=true
@@ -20,6 +30,5 @@
 bluetooth.profile.pan.nap.enabled=true
 bluetooth.profile.pan.panu.enabled=true
 bluetooth.profile.pbap.server.enabled=true
-bluetooth.profile.sap.server.enabled=true
-bluetooth.profile.tbs.server.enabled=true
-bluetooth.profile.vc.server.enabled=true
+bluetooth.profile.ccp.server.enabled=true
+bluetooth.profile.vcp.controller.enabled=true